From 0d396abf22f09ae36fa89aa109589a1a726079d7 Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 18 Nov 2013 00:56:44 +1300 Subject: [PATCH] Themes with specified gap images but no actual file crash. https://bugzilla.gnome.org/show_bug.cgi?id=712536 --- modules/engines/pixbuf/pixbuf-rc-style.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c index db1830fd61..1d7972ac5e 100644 --- a/modules/engines/pixbuf/pixbuf-rc-style.c +++ b/modules/engines/pixbuf/pixbuf-rc-style.c @@ -769,6 +769,27 @@ theme_parse_image(GtkSettings *settings, data->overlay = NULL; } + if (data->gap && !data->gap->filename) + { + g_scanner_warn (scanner, "Gap image options specified without filename"); + theme_pixbuf_destroy (data->gap); + data->gap = NULL; + } + + if (data->gap_start && !data->gap_start->filename) + { + g_scanner_warn (scanner, "Gap start image options specified without filename"); + theme_pixbuf_destroy (data->gap_start); + data->gap_start = NULL; + } + + if (data->gap_end && !data->gap_end->filename) + { + g_scanner_warn (scanner, "Gap end image options specified without filename"); + theme_pixbuf_destroy (data->gap_end); + data->gap_end = NULL; + } + if (token != G_TOKEN_RIGHT_CURLY) { /* error - cleanup for exit */ -- 2.30.2